Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 3 Sep 2010 01:17:46 +0000 (01:17 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 3 Sep 2010 01:17:46 +0000 (01:17 +0000)

Trivial merge